From: Gnus developers <ding@gnus.org>
Date: Fri, 28 Jan 2011 23:07:38 +0000 (+0000)
Subject: Merge changes made in Gnus trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5031
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=b345335ac709f7ca121df8410433d2123f05b0c9;p=emacs.git

Merge changes made in Gnus trunk.

gnus-win.el: Remove dead function gnus-window-configuration-element.
 (gnus-all-windows-visible-p): Remove old compatibility code.
 (gnus-window-top-edge): Add docstring.
gnus-sum.el (gnus-select-newsgroup): Don't try to alter the active data if the group is unactivated.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 92fbf9cdf43..26875240e98 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,14 @@
+2011-01-28  Lars Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus-sum.el (gnus-select-newsgroup): Don't try to alter the active
+	data if the group is unactivated.
+
 2011-01-28  Julien Danjou  <julien@danjou.info>
 
+	* gnus-win.el: Remove dead function gnus-window-configuration-element.
+	(gnus-all-windows-visible-p): Remove old compatibility code.
+	(gnus-window-top-edge): Add docstring.
+
 	* gnus-group.el (gnus-group-jump-to-group): Set must match to t.
 
 2011-01-28  Lars Ingebrigtsen  <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 8ee5964689e..3b003b74626 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -5542,7 +5542,8 @@ If SELECT-ARTICLES, only select those articles from GROUP."
 	     (mm-decode-coding-string group charset)
 	     (mm-decode-coding-string (gnus-status-message group) charset)))
 
-    (when gnus-agent
+    (when (and gnus-agent
+	       (gnus-active group))
       (gnus-agent-possibly-alter-active group (gnus-active group) info)
 
       (setq gnus-summary-use-undownloaded-faces
diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el
index f95162819c7..156f9a020fd 100644
--- a/lisp/gnus/gnus-win.el
+++ b/lisp/gnus/gnus-win.el
@@ -38,9 +38,6 @@
   :group 'gnus-windows
   :type 'boolean)
 
-(defvar gnus-window-configuration nil
-  "Obsolete variable.  See `gnus-buffer-configuration'.")
-
 (defcustom gnus-window-min-width 2
   "*Minimum width of Gnus buffers."
   :group 'gnus-windows
@@ -221,12 +218,6 @@ See the Gnus manual for an explanation of the syntax used.")
 	(delete-frame (car gnus-created-frames))))
     (pop gnus-created-frames)))
 
-(defun gnus-window-configuration-element (list)
-  (while (and list
-	      (not (assq (car list) gnus-window-configuration)))
-    (pop list))
-  (cadr (assq (car list) gnus-window-configuration)))
-
 ;;;###autoload
 (defun gnus-add-configuration (conf)
   "Add the window configuration CONF to `gnus-buffer-configuration'."
@@ -446,11 +437,7 @@ should have point."
 	type buffer win buf)
     (while (and (setq split (pop stack))
 		all-visible)
-      ;; Be backwards compatible.
-      (when (vectorp split)
-	(setq split (append split nil)))
-      (when (or (consp (car split))
-		(vectorp (car split)))
+      (when (consp (car split))
 	(push 1.0 split)
 	(push 'vertical split))
       ;; The SPLIT might be something that is to be evaled to
@@ -482,6 +469,7 @@ should have point."
       all-visible)))
 
 (defun gnus-window-top-edge (&optional window)
+  "Return the top coordinate of WINDOW."
   (nth 1 (window-edges window)))
 
 (defun gnus-remove-some-windows ()